From: Ray Strode <rstrode@redhat.com>
Date: Wed, 21 Aug 2013 22:00:40 +0000 (-0400)
Subject: objectManager: clear inhibitor on unregistered interfaces
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3652
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d29b86baf0fc723b2526a8de5b32b137e7ed5155;p=gnome-shell.git

objectManager: clear inhibitor on unregistered interfaces

A D-Bus service can export more supported interfaces than the
shell cares about.  In those cases, we avoid creating proxies,
but neglect to finish things up so the object manager class
knows it can mark itself loaded.

This commit makes sure we do the proper finishing, so the object
manager still loads in the face of unsupported interfaces.

https://bugzilla.gnome.org/show_bug.cgi?id=706542
---

diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index b954f1bee..f7265fe70 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -73,8 +73,11 @@ const ObjectManager = new Lang.Class({
     _addInterface: function(objectPath, interfaceName, onFinished) {
            let info = this._interfaceInfos[interfaceName];
 
-           if (!info)
+           if (!info) {
+               if (onFinished)
+                   onFinished();
                return;
+           }
 
            let proxy = new Gio.DBusProxy({ g_connection: this._connection,
                                            g_name: this._serviceName,